Merged.

diff --cc tools/python/xen/xend/XendDomain.py
index b790f3172643a2c2d36337f35ed21474488256f8,76d4fce4a9e4f9111db07d2a692288854e31e6e6..843c912fb90591efb5313eec31985f9109a6f950
--- 1/tools/python/xen/xend/XendDomain.py
--- 2/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@@ -305,6 -305,7 +305,13 @@@ class XendDomain
  
          @param vmconfig: vm configuration
          """
 -        config = sxp.child_value(vmconfig, 'config')
++        # We accept our configuration specified as ['config' [...]], which
++        # some tools or configuration files may be using.  For save-restore,
++        # we use the value of XendDomainInfo.sxpr() directly, which has no
++        # such item.
++        nested = sxp.child_value(config, 'config')
++        if nested:
++            config = nested
          return XendDomainInfo.restore(self.dbmap.getPath(), config)
  
      def domain_restore(self, src, progress=False):